Initial work
  merged 3007 - 3033 into the trunk